From 9214da34a3cb017ff0417900250bd6d18ca89e15 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 29 Sep 2022 14:46:50 +0200 Subject: [PATCH] x86: re-connect VCPUOP_send_nmi for 32-bit guests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit With the "inversion" of VCPUOP handling, processing arch-specific ones first, the forwarding of this sub-op from the (common) compat handler to (common) non-compat one did no longer have the intended effect. It now needs forwarding between the arch-specific handlers. Fixes: 8a96c0ea7999 ("xen: move do_vcpu_op() to arch specific code") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Release-acked-by: Henry Wang --- xen/arch/x86/x86_64/domain.c | 1 + xen/common/compat/domain.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/x86_64/domain.c b/xen/arch/x86/x86_64/domain.c index 62fe51ee74..9b2f7a7d7a 100644 --- a/xen/arch/x86/x86_64/domain.c +++ b/xen/arch/x86/x86_64/domain.c @@ -58,6 +58,7 @@ compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) break; } + case VCPUOP_send_nmi: case VCPUOP_get_physid: rc = do_vcpu_op(cmd, vcpuid, arg); break; diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c index 1119534679..c425490535 100644 --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -99,7 +99,6 @@ int compat_common_vcpu_op(int cmd, struct vcpu *v, case VCPUOP_stop_periodic_timer: case VCPUOP_stop_singleshot_timer: case VCPUOP_register_vcpu_info: - case VCPUOP_send_nmi: rc = common_vcpu_op(cmd, v, arg); break; -- 2.30.2